From 23204873148ffa4b2c528bd5d2c43cfb26e132c2 Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Fri, 25 May 2007 10:23:16 +0100 Subject: [PATCH] [XEND/XM] Improve error reporting in 'xm restore'. From: Mats Petersson Signed-off-by: Keir Fraser --- tools/python/xen/xend/XendDomain.py | 3 +++ tools/python/xen/xm/main.py | 11 +++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/python/xen/xend/XendDomain.py b/tools/python/xen/xend/XendDomain.py index f507104db2..4d082a5ac9 100644 --- a/tools/python/xen/xend/XendDomain.py +++ b/tools/python/xen/xend/XendDomain.py @@ -1088,6 +1088,9 @@ class XendDomain: try: return XendCheckpoint.restore(self, fd, paused=paused) + except XendError, e: + log.exception("Restore failed") + raise except: # I don't really want to log this exception here, but the error # handling in the relocation-socket handling code (relocate.py) is diff --git a/tools/python/xen/xm/main.py b/tools/python/xen/xm/main.py index 09c2750c58..bc27b6f9cd 100644 --- a/tools/python/xen/xm/main.py +++ b/tools/python/xen/xm/main.py @@ -732,10 +732,13 @@ def xm_restore(args): err("xm restore: Unable to read file %s" % savefile) sys.exit(1) - if serverType == SERVER_XEN_API: - server.xenapi.VM.restore(savefile, paused) - else: - server.xend.domain.restore(savefile, paused) + try: + if serverType == SERVER_XEN_API: + server.xenapi.VM.restore(savefile, paused) + else: + server.xend.domain.restore(savefile, paused) + except Exception, ex: + err("%s" % ex.faultString) def datetime_to_secs(v): -- 2.30.2